Refactored for the last time