more few changes ...