Not sure If I fixed somethings