I think I fixed everything