removed intermediate lib, simpler without