add gandi, space things out better