rewrote modals to be consistent with other code, added separate check for cerise