changed logic to not display intermediate screen on load