bad name... man need to test this entire file that refactoring broke everything ;)