fixed update status

Roger can you revise this code, I think I succed the update button for the status,

make a comment if you see something strange.

Don't merge anything