rev1

re-organized