Now splitting callback correctly