Finally everything working
 Final 2b submission