second commit with makefiles updated