Merged methods

Also renaming and tweaks.