go back to old inheritance scheme for now