Further refactoring, Added functionality for "group1" and "veratax_shane"