moved around variables