More work on p2 raptor image shape.