Edited code and Makefile