Streamlined Old Code
Commit Due To Github Derp