Updated branch with new Gems