commiting final changes for NAS Setup