Refactor
Add check for new versions
Fix issues when using modes other than standard