Better timing (45/48)

Better timing