still some bugs, closer