changed location of update and object structure