Made some changes to the main method. Currently a bug with v1...I don't know what