changed variables to follow the same pattern