5.3: More deadline changes