updated app and Makefile