Update for Viceroy 0.0.20