Refactored Interest Assessment
Merge branch 'develop'

* develop:
  Refactored Interest Assessment