Challenge/Core - Update System
Fix Crashes