Added Conditional to handle lack of selection