A few simple changes/improvements could improve this property enormously.