add jaad that hopefully eliminates full rebuild