incorporate reannz specific changes