changed core to dynamic class