Added more code to main driver