third commit
modify and add some thingy