need to rewrite system geometry for simplification