Merging Earisu's to fix conflicts