few changes yayY