Handled some dismissals.Need to handle more