Got rid of that enumerator ish