//new mode
//small fix
//merge