Reverted to original MakeFile