Added more 2D shape functions