update - created 2 classes and changed work flow