Better timing (12/48)

Better timing