Refactored to have agreed variable names