Eric fixed everything