Updated for version 2.0.6