fixed warren2 added tokuda and kalcheim 2