All fixed and working