add one & all to wrapper