Changed deadlines ot be calculated on the fly