last changes before DB restructure