changed from this to just using the instance variable names