forgot pass and some bugs