removed leading underscores on variables to avoid confusion