fixed var names again