I believe this is not needed anymore after @elyezer refactoring?