DOC improved (1. and 2. meanwhile)