Code change for callback firing