Adjusted for version 2.0