Getting it to work on new comp
Clean up the code a bit