5 Years Ago
bit more refactoring