merge yves changes