removed updateObject call to reduce complexity