remove comment error and add time zone