the real work not merged..not very good with git