More work on rewriting POS
More work on POS