Added missing steps / tasks