Update Main and header files