changing to use group endpoints