Added Duration logic