completed two criteria edge cases