changes to support fancier views