fixed PS1
clean up
merged
merged