NEW STUFFS and fixes