Refactored functionality.
Changed version.