upgraded gems
merge