first commit for revised version