Masha refactor
fix geometry util y; parameters; shape;