Adjustments for Estate Prep for demo