Valiant refactor that still doesn't fix the problem