Arguments passing functional
Bug fixing