Add commands for Pass 2