Update: Accidently removed old flags, add back.