RDP refactoring...