removed unneeded header
more move with make_safe_callback
added test