switch to a better form, time comparison fix