Added rank enhanced duration and optimised a little