Added extra params and removed logging.