fixing merge conflicts after moving custom access pattern stuff to new branch (which involved some reverting)