Moved vars around