Heuristics and updated interface