some chanegs...