Some bugs solved. (It works)