F22 Self Contained Change: Nautilus Improvements