Added a load of variables