minor changes to self referencing