better handling of integrals
change needed for reports