Changed to use static lib