renamed and grouped functions