code commit for final test

merge code to master with final2