replaced parameters to functions