updated red branch
updated red blue
updated rebased
conflict resolved