update and working