Merging from previous Conflict and Update

Conflicts suck.