syncing up with SAMBA_2_2