Merging is not my strong suit. Fixed the merge.