JC: made all spec passes.