Your proposed modifications sound good. Be sure to be specific in your final submission about your changes so we know what to look for, in particular what changes to AI you have made.
