DO-302/lots of small adaptations