Well, fixed and tested all the thing