exp 2 fixes