Added more log and callbacking