updated for version 1.0