added update dynamic
added update stuff
resolved conflicts