Exp 3 fixes