Added functionality for the no question edge case