Better timing (5/48)

Better timing