Fixed the merge, had some conflicting code earlier