parameters modification corrected, fully working