migrate to single view