Improved Edge case discussions