added endpoint control