new libs + refactoring
more new libs