Fixed & clarified the CBC implementation