updated for ssh and others