updated to include new shoemaker_f function