More work on p3 raptor image shape.