fixes and worked