Specs updated for the new logic.