Added scrapped check