9 Years Ago
More refactor