Made changes to GoldbergDemo