Merge changes from psnewmodel