Modification for FMVA. Still using old version of makefile