PR for code review

also for the arguments i changed to lowercase po.