Updated should do everything