Modified and fixes