fixing to use native time arithmetic