Refactored
Version bump