Updated version to match ant script