soooo many fixed and changes