i
Fixing double execution
Adding removed class
General fixes