Made some changes at gcm