Additional POS changes by Jonathan