changed variables names