More refactoring.
Fixed ignored params.