make service more similar to a official recent version