Better timing (15/48)

Better timing