rename lots of variables etc...