Just working on minimal changes.