Chenged some code