deadline: Bit more tweaking