Is all this validSelection stuff still needed?