Local changes before refactor