optimise in_progress set