Renamed and re-factored mod