some changes for gem