Reverie upgrade changes