Refactored as my last changes failed a few test