added switch draft