Use linear indexing
Update for changes in Base