New way of passing parameters
Revert "New way of passing parameters"

This reverts commit f5451e82018c708698b3046ad7d5526e46d0d757.