cleaned up time control