Updated for 1.21 release