Latest improvements from published version