Merged
I hope I didn't break anything this time