Update by NTUA

NTUA