Upgraded soy lib