header and makefile updated