Merged some chages