Changes after review B&L