stuff and samba added