Bumped version nr
Refactored