Some final changes before the rework