added path aliasing
resolved merge conflicts