1.5.2 almost done