Joshrendek patch 1

Not sure what happened. Merge this to complete the PR.