Ditched the defering logic