refactoring
transition to next endpoints
updating libs