Updated using goal class in main