Refactor the POS
Merge Conflict