added debugging values and setup the handler properly