Fourth round of changes for feedback