More work for version 8.