Better timing (16/48)

Better timing