More changes to get MS3 integrated