revamped Services optimizer