updated ex1/ex2 all together!