Better timing (30/48)

Better timing