updated for non-moving time