FInal Commit pre demo