final updating, everything works