Report made more flexible