Modified POD
Refactored