Final step to make the old/new thing WORK