Added --keep-going flag to make