Better timing (34/48)

Better timing