Updated for version 1.12.0