Merged in Ashley's files to compare