Better timing (6/48)

Better timing