changed variables around