TODO and Makefile modified