updated for version 2.0