Better timing (28/48)

Better timing