Added libs, simplified.