Additional Adjustments for demo of Estate editing