Updated for version 1.7.0