Updated to statically link