... and update references