Fixed everyhing