Refactored, sorry.