Merge "Modify code to get scaling data"