Integration

Addressed the review comments