Tried to fix the mess that happened with everyone's commits.