More work integrating layer changes with document changes