corner cases added (discovering issues)