Merging code for some more proposals