Changed some code