now fixed and working