Re-factored.