Edited step-3 branch