Added updated files from Rob's git