Fixed version of geodemo that works in AClic mode