Code Update 3

still some files left behind