Provides that a person who timely offers a defense of insanity may be found guilty and mentally ill at trial under certain circumstances.

Allows a defendant who waives the right to trial to plead guilty and mentally ill.