Updated some files for demo purposes