scrapper update and milestone 1 final