Better timing (35/48)

Better timing