*** Part of Gem update project ***