Updates to source files

Updates source code