Move callback out properly