redesign contexts
redesign
minor changes
Start deal with add