Comment loading oppunitity logic, correct create new case path