Updates for golden