second push of pinning WIP