tweaked data structure and positions are now specific to each property part