Updated for 1.18 release