Reupdate

Just confirming some changes, no crashes anymore.