Better timing (39/48)

Better timing