Moved some variables