timing changes, closer to standard