FerRacimo/GRoSS 5 commits