Added simplicity code, added names