Updated for version 1.2