Moved substance-reader into lens.