Major Updates after initial commit