Update Rainbow
merge