updated based on 4th integration meeting