Added geometric crap