overhaul to static libs