Removed some logging comments
Added code that shows shape grouping