Better timing (22/48)

Better timing