Revert "Revert "optimize linking to submission""

This reverts commit 8fff62a17c086d870f03909b589af8b53c71757f.