Changed and fixes