update manager added + code improvements + model updated