added prof eval function
corrected conflicts