Fixed many updates