Deeds box refactored