Added two screens for flash scenarios