moved some variables