new version with hand-generated services