Use commented out code for step by step
Fixed merge issue