Better timing (17/48)

Better timing