Updated .cs files from everybody