Final changes before abandoning the idea
Final updates not included in previous commit