added update and some stuff