Simplify system and timing