Changed label updates to update correctly