timebomb improvements