Updated for new release 2.1.2