Changed some source code for testing