Bernhard's changes