- handle arguments as parameters
- fix performance change