Added more missing steps