grouped and fixed bugs