General Updates & Switched back to Hammer