Fix bugs & Working version