Recomit so that only one check for activity is needed which is in
supplier class. Only concerns that class and remove suppplier gui