Updated some files from Hanson