Adjusted for version 1.1