Realized flaw in logic
Moved back to helper