Updated for gem.