Updated for v5.18.1
Updated for v5.19.3