Refactor using built in add seconds to Time