manually merging will's changes
more merging