restructure after ben’s changes