Modified Shapes.java