Main and Makefile updated