halfway through fixing PoS