Update for golden master
Prep for resume