updated with improved CIFS mounting