updated with scrap and angies