Update and re-org