After fixing some bugs