some edge Scenarios maintained
some edge Scenarios maintained