test_update added
merge changes