Pre-merge stuff