follow DaNiwa's suggestions