Added APF steps
Resolved merge conflicts