Sync code between eSpace and fez (cont)