Re-added code and header files