GORDO
Merge branch 'Joca'
FIx retardedness