Add Luke's modified files