Adding filtering to rebuild, changing around other bits.