Added old makefile as well