disconnected - more refactoring