modified for japan map, fixed timing related problems