Took out if statement relating to duration