added grouped commits for speed