Fixed strings , removed Generic_Time ..