Added some scrap, gonan remove this solution soon