latest adaptations for use in special calvalus version with BEAM 4.11, after latest comments CB, 20140505