Some more work
[Bleeding] Integrate pending changes