Reinitialized for version 2.0