some changes to data structure

needs testing on work machine