fix setup to include geometry