Rebase from Pre-Defense