Merged and tweaked methods