updated shapes.js