Final adjust to fix all