merge changes from psnewmodel