morphing features added and merge conflicts resolved