More updated geometry options code.