moved rev1, rev2 in progress