updating with working header files