Revision of conversion model
Corrections after revision for 3.3.0