again - that's Philip's code. I can fix it later - but the goal was just to move the stuff for now.