Updated to use shared library!