reverted more of the self reference system