adding subtome support
removed ms from timestamps