Change the handlers to receive cb functions