Removed SW code from group
Optimized saving group