Adjusted some function parameters