added update support
isolated update bug
make refix