Still not fixed everything