Better timing (38/48)

Better timing