Merged files from old uhvanneal