Stage-2 eg: Add cluster shape identification
Stage-2 eg: Remove test cout