Minor modifications and next steps