masterDataSetup was commmented out. Gave problems.