More Changes after Gem Update