Changed the mechanic for duration expiry to switch statement