Constraint by fixed activity
Refactor symbols
Merge branch 'Before-Refactoring'