add some bugs to be fixed