Refactored some code and remembered that I need to make two passes