Removed some debug tracing and implemented onReshuffle callback