Architecture Modifications for Conditioning