Returned to the predemo situation. Previous commit has final situation, this commit has starting point of demo