Added scenario choice functionality