removed intermediate lib, simpler without #2