Back to the previous version. Ready to refactor