Should I rework my estate plan