changed variables to fix