Appropriate libs now used, modularized