Finally fixed everything :)