refactoring
Merge remote-tracking branch 'origin/vani's_branch' into Ben's_branch