last change before merge from troussil branch