Refactoring
Changed version