latest improvements for #54