Added nb features and more training