Updated all changes before hackthon

Updated all changes before hackthon