Changed some coding