replaced depracated flags and functions, renamed service to fit other service files