added different shapes