Merging latest changes - reformatted/optimized code - renamed group id