Corrections for version 2