added PS demo -- needs more clean-up