Adding some geometry