adapt to current best practises