Refactored even more...