#50 removed scenario from logic