I fixed it a bit more