For testing purpose included modified core