Finally fixed everything