Issue #7 handle different cluster ranges better