need reextraction of the old curves for testing, but code should be ok