Updated aot crap