Update & rebuild