Refactored deltarepo