more version updates & adaptations