Refactored, hopefully for the last time