Major update - reduce refs