moved some variables and added some for future features :-)