just changed variable names to camelcase