Replacing The Baffles