some gems added
some changes