Better timing (36/48)

Better timing