morphing features added
resolved merge conflicts