merged branch from Semi-final