* add two exceptions and some comments
*renaming the class and add one line for update the system1 in cut case