Patch 3: [UNTESTED] moar security