Added other shapes