rename safe to handler