Modifying to use shared libraries