improved samba methods