somes changes ...