Refactor and Red UpdateHarald