massive changes to work with new Position format