US507 Steve's changes and finishing moving messages around