Refactored duplication. Bumped version to v.0.6.9