add features as requested on uservoice