Added all of PS's latest changes.