few changes ...