revamped Services optimizer #3