Make SCRAP a little better still