updated code with support for experimental parameters