changes to make compatible with Archi 2.6