Added some scrapping codes