Before modifying the cases into separate classes.