changes including the makefile