Sujen Fix
merging project, delete add to rule, minor refactoring.