Changed vars around