Ps enhancement
closes #24