Better timing (48/48)

Better timing