removed unnecessary parameters