IDE-810 work in progress