scrap now only happens when scrap button is clicked