updating to work with Edition refactor