changed to not use existing libs