Modified some source files