changed variables
fixed dependency bug