some chode changes