Better timing (37/48)

Better timing