Changes from lab computer

Testing done, need to finalize changes to code