Updates to makeShape.js