Edited file to reflect refactoring of 3 in prepration of 4