Added callbacks, still timing out