Better timing (20/48)

Better timing