Major changes
Makefile