Better timing (42/48)

Better timing