Added some ordering when examining self
Added a bit mor with the TF into dolphin