Removed computation from update loop