sanity, refactor XDDdd