1.2 almost done