some edge Scenarios maintained