added multiple shape functionality

added multiple shape functionality