after fixing some bugs