Updated a few things in the main method