Slowly convert back to old ways to find problem in code