all fixed i think