latest changes from feedback