Refactored
Merge branch 'updates'