Better timing (32/48)

Better timing