1st commmit 8/16