merged latest from Georgios