Narwhal-update--18