Fourth round of changes from feedback