Updated main to use new methods