everything tested and working
replaced unphysical parametrization, added corresponding tables