Begun changes for the various geometry