Updated code slightly for home demo