Removed Shape from optional arg