removed unused function parameters;