some changes dedicated to new model Me