Merging changes from Marquette team's update.