Slightly refactored repository method, awesome thing!