Better timing (40/48)

Better timing