added process state presentation component, email tweek
merged local with origin