fixed everything but one last thing