Re-Sync NOCAT with Shibby's branch