Separate out geometry