fixed and changed...