From refactor in master branch