improved helpers,