Removed PS1, fixed comp error