Timestamps fixed, dropped field functional