Tried to fix... Still needs work