Made method of sovling for Psi in Case I more consistent with Case II