Golden: general update / rework