Some Situ improvements