some changes before a refactor