reflexted changes from 1.2 => 2.0