Work on fixing update bug