Fixed bug
big chnage.