Port to spec