Better timing (41/48)

Better timing