noted some bugs