rebuild including a couple features pulled in