m5 prelim update
merge conflicts