revamped Services optimizer #2