Better timing (8/48)

Better timing