additional parameters calculation added, not yet tested or checked with external suorce