fixed and now working