fixed everything
fixed everything 2