Code fixed and time helper fixed