all fixed i promise