Updated for version 1.8.0