combine two part
modified makefile