Final improvements for now ...