0.22.04/06 (Nivve) prophet changes