Better timing (24/48)

Better timing