tried more improvements for #52