rev2 almost ready...