initial commit of ver. 2