added null return to callbacks