Callback mechanism re-implemented, no known bugs