some changes from PS
Merge...