Better timing (33/48)

Better timing