some chnanges