couple changes before big refactoring