Changed some source code