refactored and added missing modifier