Refactored mesh to fix a design error