Updated for version 1.0